Resolved cherry-pick conflicts