Re #6924 Add more option to job submission