cherry-pick release-1.0.0 changes