Merge pull request #23684 from stangri/master-pbr