t6: Switch to cm-12.0 branches