Re #7769 Update job submission and query