Merge pull request #16670 from demeritcowboy/audit-tpl-3