Backport Everything b1.7-b1.7.3