Fixes #4287 - Join directly to template_combinations when resolving templates
(cherry picked from commit 1443ec139bdb0a31faeef80f6c177d4f30fa4bdb)
Fixes #4287 - Join directly to template_combinations when resolving templates
(cherry picked from commit 1443ec139bdb0a31faeef80f6c177d4f30fa4bdb)