Upgrade to v2.6.0