Merge pull request #18939 from neheb/18