Initial merge of commit 6dac4eda3d7819a790692e7e088b15264c8dff80 from cm-10.2 to cm-11.0