merging upsream cm changes