Rebase to deployment