Merge "cm: New ultimate revolutionary feature of revolution!" into cm-11.0
(cherry picked from commit 20bb5f821315cf3400b65f2d28153b237465084d)