Do not poison the pubsub handler, in order to prevent shutdown hangs.
Merge branch 'master' into uuid