Merge pull request #10052 from dhewg/pull/mpc