Merge pull request #10922 from eileenmcnaughton/tpl