merge CM 11.0