merge from cm10.1 wip