re-cherry-pick3