Merge pull request #19965 from eileenmcnaughton/mem_trxn