rebase with CM code