Stop job feature

Merged Cage, Gregory requested to merge stop-job-feature into dev

Merge request reports