Service the event bus on each event pub
Merge remote-tracking branch 'upstream/develop' into sam_raet_22