Backport Everything b1.2-b1.2_02