Merge branch 'hotfix_edm26' into 'master'
Adding option to EventDefinitionM26 to directly add the trigger ts information to the event See merge request !445
Adding option to EventDefinitionM26 to directly add the trigger ts information to the event See merge request !445