Merge pull request #21651 from eileenmcnaughton/tpl