[1.4] Update - Combo improvements