Re #7311 Tweak tool tips and minor refactor
Merge branch 'feature/7311_remote_job_status_ui' into develop