Merge pull request #1 from sultanxda/cm-11.0

Update