Merge pull request #18979 from eileenmcnaughton/trans