4b2338e Merge branch 'feature/trajectory_playback' into feature/timeline