Delayed all iterative filtering until after the fast filters are finished.
Merge branch 'master' into sched-exp