Merge branch 'release-0.9.6'