cherry-pick from the master to update to 6.01