Merge pull request #17987 from eileenmcnaughton/pseudo_mem