[TIMOB-12067] Bug fixes and event parity