this is cm-specific change and should be in cm.mk