merge in upsteam cm-11.0 changes