Reverting to old RunningJobManager
Merge branch 'release' into develop