Move to 6.0-SNAPSHOT