Merge branch 'main' into codex/fix-query-options-declaration-emit