Fix mismerge of 3.4.87 merge

Change-Id: I3be2d6890fd16a10a0e03ea30b6a249e513a3a83
Merge pull request #7 from daeiron/cm-11.0-new

Fix mismerge of 3.4.87 merge