Update for 6.0.x
Update for 6.0.x