Update to 5.8-SNAPSHOT