Update for Job kill
Merge branch 'develop'