Merge branch 'upstream/cm-11.0'

Signed-off-by: Almite <almite@hotmail.com>