Merge branch 'main' into ci/compare-dmx-pytest