Fix rebase to current development branch