Merge Release/0.9.8

Merge release branch back to develop.