Copy past error
Merge branch 'template_variables' into integration