Merge pull request #16960 from neheb/3