Update from cm 11.0 branch