Merge pull request #1 from aidasaidas75/cm-11.0

fixes
Merge pull request #1 from Optima-Team/cm-11.0

Merge pull request #1 from aidasaidas75/cm-11.0