Merge pull request #23880 from stangri/master-pbr