merge cm10.1 branch