Release 9.7
Release 9.8
Merge remote-tracking branch 'hsleisink/master'