Merge "Bug-2208: pcc-mock code refactoring"