Merge "[PMSH] Update the data-format schema for events"