OSPL-3315 Update MPC stuff on general principals.