Update to 5.7-SNAPSHOT