Cm 12.0 merger upstream