Bug/2937 events should be asynchronous