MDL-25981 make sure cm is defined