chore(merge): merge 1.9 to 1.x