Merge pull request #17958 from neheb/9