Merge "Use mfpr 3.1.1 and mpc 1.0.1"