First draft to create tracks in the timeline
Merge remote-tracking branch 'origin/timeline' into timeline