OSPL-3315 Update MPC stuff on general principals.
OSPL-3315 Putative fix for people to look at.