Merge branch 'hotfix/fix_template_errors'
fix minor errors
Merge branch 'hotfix/fix_some_errors' into develop