Merge pull request #18020 from eileenmcnaughton/pptrans