Merge "Correct propagation of asynchonous events"