Merge branch 'develop' into release/0.1.x