Merge branch 'jc/diff-b-m'