Merge from trunk. Kills procs in sliver rather than restarting context.