Move MCPC fix off for quick release.
Merge branch 'MCPC'