Merge pull request #17377 from neheb/21