Merge branch 'mc/setup-cd-p'