Merge branch 'hotfix/2.0.1'
updated the templates
changelog update
Merge branch 'hotfix/2.0.2' into develop