Merge pull request #19834 from neheb/7