Merge pull request #1 from hsr0/cm-11.0

Merge commits from main repo
Merge pull request #2 from TamsuiCM11/cm-11.0

Merge pull request #1 from hsr0/cm-11.0