Move stop to job

Rebase of #2737
Closes #2737