Merge branch 'mc/cd-p-pwd'