swapped queue pool for nullpool
only running and finished statuses
Merge branch 'master' into develop
storage bugs