Added new `kill_on_scatter` option