Merge pull request #19763 from stangri/master-pbr