Merge branch 'hotfix/v2.0.1'
Merge branch 'develop'
To v2.0.1 of static assets