Upgrade to 2.6.0-SNAPSHOT