Upgrade to v1.9.7