Merge "Job killing function moved to pipeline library"