Merge pull request #18819 from eileenmcnaughton/import