Graceful shutdown is not working as expected with default setup.

Graceful shutdown is not working as expected with default setup. #11478