Bring inline with CM10.1