Merge pull request #20158 from stangri/master-pbr