merge latest cm10.1