Rebase patches.
0014 is not workign yet, will do in the next commit.