shutdown + bugs
Merge remote-tracking branch 'CloudDB/master'