439067 Improved graceful stop timeout handling