Merge pull request #20738 from eileenmcnaughton/tpl2