Cherry-picker2-min