Rebase patches on r1290