Rebase patches and update latest WIP.