Upgrade to 25.0-SNAPSHOT