Merge branch 'main' into ci/turn_build_warnings_into_errors