Fixes #4287 - Join directly to template_combinations when resolving templates