Stable/cm 11.0

Support
I802cf4d20eb3b45ce068f89c22352f79999d