Always run AfterDisconnectedHook on shutdown.
Merge branch 'master' into release-test