7.x changes