Merge pull request #19108 from eileenmcnaughton/import