ArchiKernel: Update with cm-12.0 changes