Prepare events in #call{}
Merge branch 'events'