Do not add the events datastream to the round trip template, as it should be managed, not inline
Merge remote-tracking branch 'origin/master'