Merge pull request #10295 from eileenmcnaughton/tpl