Merge branch 'vendor/MPC'