Follow ivanich's cm-12.0 branch