Update to 1.0-9.7