Merge branch 'hotfix/0.2.0_7320881'
Merge branch 'hotfix/0.2.1' into develop