Backport Everything b1.8-b1.8.1