Upgrade to 2.5.0