[GIT PULL] Second round of MCPM refactoring