Merge branch 'jk/add-i-diff-filter'