Moving up to 4.0-SNAPSHOT