Rebase patches on r1266