Feature/filter flushing execution

this PR from the shared branch will replace #1260