Final rebase before cutover