Cm 11.0 upstream merge