Rebase build system against CM