Backport Everything a1.1.2a-a1.2.6