Some fixes to shutdown logic.
Merge remote-tracking branch 'origin/master'