all the 2.4.x changes