Fix cherry-pick