Upgrading from 2.5.x to 2.6.x