#19758 Refactor to use Job controller