Now makes use of singleton again
Merge branch 'fix-jobsingleton' into dev