Rebase of main project track