Merge branch 'hotfix_edm26' into 'master'

Adding option to EventDefinitionM26 to directly add the trigger ts information to the event

See merge request !445
21 jobs for master in 21 minutes and 24 seconds (queued for 7 seconds)
Scheduled