Issue 318 flush tasks