[OE-5131] pass an event to reduce coupling