merge latest cm11 commits