Merge pull request #13116 from neheb/kl