release 0.9.6
Merge branch 'release/0.9.6' into develop