Merge branch 'jc/diff-test' into th/diff