Merge branch 'main' into ci/correct-smoke-test-mode-selection