Merge branch 'stu/fix_job_retry' into copilot/sub-pr-4961

Merge branch 'stu/fix_job_retry' into copilot/sub-pr-4961 #1727