Merge pull request #21452 from eileenmcnaughton/mem_test