Merge branch 't/remove_no_default_filters'