Merge branch 'develop' into release/0.9.6