Update to 1.7 without fork