merged 2.2.3.x and 2.2.4.x codes