Initial Changes for cm-12.0