Rebase patches on r1286