Merge branch 'evtTypeFix' into 'master'
Fix overlap in event types
See merge request !1345 (merged)
(cherry picked from commit 18d743ed)
dff4118b Fix event type
Fix overlap in event types
See merge request !1345 (merged)
(cherry picked from commit 18d743ed)
dff4118b Fix event type