Merge commits from CM