merge CM 11.0 branch