re-cherry-pick2