2.5.x changes for 2.5.0.CR1