Merge pull request #20813 from colemanw/tplFixes