prepare to refactor into branches for 2.4.1.x, 2.5.0.x