Merge branch 'jk/filter-process-fix'