Add variables to template resources so that I can override them in a wrapper
Merge branch 'template_variables' into integration