Merge with Cm 12.0 source