Merge NoCMPIE to cm-10.1 branch the lazy way