Merge branch 'hotfix/0.3.2'
Merge branch 'release/0.4.0'
Fixed reference to job_in_queue
Merge branch 'hotfix/job_in_queue_check' into develop