Enhance performance
To shutting down gracefully
Merge branch 'develop'