Update to 6.0.x