Merge pull request #2 from daeiron/cm-11.0

Update from main stream