2.6 branch created