cm: New ultimate revolutionary feature of revolution!

Change-Id: Ia3d0a099b8cb0c5170f3aaba0fb68d1f216b6be7
Merge "cm: New ultimate revolutionary feature of revolution!" into cm-11.0