Merge branch 'jk/diff-convfilter-test-fix'