Merge pull request #17642 from eileenmcnaughton/trxn