[HELIX-422] Simplify single job creation, fix merge