Merge process-kill and process-end-kill