CMS merged upstream