Merge pull request #23366 from eileenmcnaughton/import_tpl