Handle graceful shutdown
Merge branch 'kue' into develop