Cm12 rebase