Update to v1.7

Update to v1.7