Merge pull request #20153 from eileenmcnaughton/mem