updates from cm11