Merge pull request #19822 from neheb/8