Upgrade to release v2.5.0