Change for tests of duplicate events
Merge remote-tracking branch 'origin/V2.02'