MDL-45319 events: trivial changes
MDL-45319 events: added missing validation