Merge remote-tracking branch 'upstream/main' into main-schema-test-coverage