Merge branch 'main' into ci/format-switching-tests