Upgrade to v2.5.0