Merge branch 'release/0.2'
Merge branch 'hotfix/test_hotfix' into develop