Backport Everything b1.3b-b1.3_01