prepare for branching (2.x)