Merge branch 'stop-job-feature' into 'dev'