Merge pull request #22 from VWoeltjen/master

[Scenario] Timeline Rollout #1 Features
Merge pull request #23 from VWoeltjen/master

[Scenario] Timeline Rollout 1.5 Features