Merge branch 'eventTypesFixes' into 'master'
Fix duplicate event types
See merge request !1574 (merged)
(cherry picked from commit 946913f8)
c39eb261 Fix duplicate event types
Fix duplicate event types
See merge request !1574 (merged)
(cherry picked from commit 946913f8)
c39eb261 Fix duplicate event types