[merge] cherry-pick