New event queue mechanism
Branch merge