Update to release-0.9.7