Initial rebase done. Final changes to be started.