Merge pull request #16127 from eileenmcnaughton/mem_test