Merge pull request #14919 from eileenmcnaughton/mem_review