Modifiable timeout
Merge branch 'on_event_change'