Merge pull request #18997 from eileenmcnaughton/trans