Jobs control Fixes
Merge commit