Fix cherry-pick's