Merge branch 'main' into ci/dmx-comparison-manual-job