Merged latest CM-11.0 code for upcoming M release.