Bumping version to 2.9.6
Merge branch 'release-2.9.6' into develop

* release-2.9.6:
  Bumping version to 2.9.6