Merge pull request #23135 from eileenmcnaughton/memm