Upgrade to 4.0-SNAPSHOT