Merge pull request #17378 from neheb/22