Merged updates from CM10.1