merging upstream cm changes