Re #7311 Fix submision issue
Merge branch 'feature/7311_remote_job_status_ui' into develop