Merge branch 'jc/diff-prefix'