Updates from CM10.2