Pull DerArtem's Changes to CM10.1