Merge branch 'jk/diff-convfilter'