merge into cm-12