Merge part of 'jc/diff'