Also refactored stuff just a tiny bit. Closes #1179 (closed)
Pipeline #40926 passed
Pipeline passed for 09f37836 on timeline-view-menu 2 years ago
Pipeline #40964 passed
Pipeline passed for 068139b2 on develop 2 years ago