merged cm11 changes