make (fix diff test)
Merge remote-tracking branch 'origin/MPS3.0'