Merge pull request #18129 from neheb/8