Merge branch 'hotfix/0.2.1' into develop