Cm 10.1 upstream updates