Merge branch 'mm/diff-no-patch-synonym-to-s'