Merge pull request #14640 from neheb/ks