Update to 1.8 SNAPSHOT