Merge pull request #20296 from neheb/1