Upgrade to 2.7.0