Branch rebase and related changes