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

Signed-off-by: dragon <dragon7780@hotmail.nl>