Merge pull request #16949 from neheb/10