updated the templates
changelog update
Merge branch 'hotfix/2.0.2'