Merge pull request #20969 from eileenmcnaughton/mem