incorporating filter updates from master manually (before formal merge)