Merge "Updates event source to important parent only when events are merged" into main