Merge pull request #1106 from marcel-blonk/BRIDGE-86

more changes for events and timelines
Merge pull request #1108 from marcel-blonk/BRIDGE-86

test fix: add new type