Merge pull request #23925 from stangri/master-pbr