Merge branch 'hotfix/1.1.1'
Add hide/show template logic to templates
Merge branch 'hotfix/1.1.2' into develop