Upgrade to v2.25