Merge branch 'release/0.9.6' into develop
version update
Merge branch 'release/0.9.7'