Rebase patches on r1274