graceful shutdown and support for multiple instances
auto-merge staging into master