Merge branch '1361-timestamps-in-jbm-trace-not-affected-by-delay-compensation' into 'main'
Resolve "Timestamps in JBM trace not affected by delay compensation" See merge request !2198
Resolve "Timestamps in JBM trace not affected by delay compensation" See merge request !2198