Merge branch 'main' into ci/treat-warnings-as-errors-only-in-ci