Merge pull request #19924 from eileenmcnaughton/mem_ex