fix template vars
Merge branch 'hotfix/1.1.2'