Merge pull request #23545 from eileenmcnaughton/import_location2