Merge pull request #21735 from colemanw/tplFix