ADD: event queue/limit
Merge