Merge branch 'main' into ci/updates-to-ci-linux-json-files