Merge branch 'fix-m' into add-P