Backport Everything b1.1_01/02