Merge branch 'main' into ci/fix-conformance-job