rearrangement for 2.2.x release