Initial CM 11.0 commit