Merge pull request #14940 from eileenmcnaughton/mem_import