Rebase patches on r1283