Merge "add kill all for shutdown_timeout of 0"