Merge pull request #10793 from eileenmcnaughton/tpl