[PATCH 0/5] Second round of MCPM refactoring