merge cm11 branch