Merge branch 'hotfix/0.2.1_7396046'
Merge branch 'hotfix/0.2.2' into develop