Handle keyboard interrupt properly

Theodore Changrequested to merge
graceful-shutdown into develop

Merge request reports