Merge branch 'jc/diff-merge-base-multi'