Merge branch 'main' into 261-jbm-trace-file-writer