Merge branch 'jc/diff-test-updates' into maint