Merge branch 'refactor/use-job-queue-everywhere' into 'develop'