Fix cherry-picking