Merge pull request #23714 from stangri/master-pbr