Merge branch 'hotfix/hotfix'
Template fix
Tags fix
Merge branch 'hotfix/hotfix' into develop