merge cm upstream commits