Merge CM branch CM-11.0