Backport to 3.1.x [TIMOB-14114] fixed sending duplicate events