Merge pull request #20313 from neheb/10