Cm 12.0 merge request 2014_12_24