Merge cherry-pick