Merge branch 'jc/diff-filter-negation'