[TIMOB-10464] Event bubbling architecture changes