Rebase to newest code and solve all conflicts and compile errors.