Re #7405 Save separate-job to output file
Merge branch 'feature/7405_fix_remote_sub' into develop