Merge branch 'main' into ci/enforce-warning-free-builds