Merge pull request #19300 from eileenmcnaughton/import