merge cm11 changes