Merge pull request #21550 from demeritcowboy/template-missed