Various updates and cleanups
Merge pull request #1 from arco/cm-11.0

Various updates and cleanups