Merge branch 'release/unify-template' into develop
change contact email
Merge branch 'develop'