Upgrade from 5.x to 6.0

/Upgrade_from_5.x_to_6.0