Merge pull request #24349 from eileenmcnaughton/import_mem