Update to v1.7