Merge branch 'hotfix/2.0.2'
- added more boilerplate files
Merge branch 'hotfix/2.0.3' into develop