Merge branch 'main' into 1361-timestamps-in-jbm-trace-not-affected-by-delay-compensation