Merge remote-tracking branch 'github/cm-11.0' into HEAD

(cherry picked from commit 74427aebff32129ceb78671849a56be0a3b47f1a)