Merge branch 'jennifer/filter-dev' into debian-testing