Upgrade to 5.0-SNAPSHOT