Rebase and update submodules