Merge remote-tracking branch 'origin/cm-11.0' into jb-7.8