Merge "implement timeouts for events"