MDL-45319 events: trivial changes to keep consistency in core
MDL-45319 events: added missing validation