more changes for events and timelines
Merge remote-tracking branch 'upstream/develop' into BRIDGE-86
Merge pull request #1106 from marcel-blonk/BRIDGE-86

more changes for events and timelines