Turn hook filters into flow-step filters
Merge branch 'flowfilters' into hook-refactor-squash