merging cm upstream