Merge pull request from Team-Hydra/cm-11.0