Update to latest CM10.1 work