Merge pull request #15115 from eileenmcnaughton/import_metadata