Ongoing work to implement support for graceful shutdowns...