Feature/merge release

This merges current release/0.9.7 back to develop, so that we can easily add features to either, as needed.