added some PubSub updates
Merge remote-tracking branch 'origin'