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

(cherry picked from commit 0cdb7f0514bb7ea3333a621d81f66d70a30da635)