Merge pull request #1 from hsr0/cm-11.0

Merge commits from main repo