Initial import from CM 10.2