Fix bug with executing events in Trace
Merge remote-tracking branch 'origin/develop' into develop