Moving cherry-pick before the other merge options