Cm 12.0 upstream