MOE_42: EventBus improvements