Merge pull request #21194 from 1715173329/pgr