Release/0.9.6

Merge changes from 0.9.6 release branch back to develop.