Merge fixes from jennifer/filter-dev branch