Latest Cm 10.1 changes