Release/0.9.7

This merges 0.9.7 back to develop.