Merge branch 'hotfix/0.2.2' into develop