merge latest changes of cm10.1