Merge branch 'DeadZen-dz-event-stream-processing'