Merge pull request #10959 from mlutfy/cleanup-pcp