Merge remote-tracking branch 'upstream/dev' into perf/session-timeline-virtua