Staging upstream rebase