Production-level performance for the bugfix...
Merge branch 'no-more-tasks-workaround' into skytruth