Update History
Make shutdown behavior more graceful.