Merge part of 'jc/diff' into next