Merge pull request #19246 from eileenmcnaughton/import