Backport Everything b1.5-b1.5_01