Soft kill update

Cage, Gregoryrequested to merge
soft_kill_update into dev

Merge request reports