pull changes from cm 10.1