Merge branch 'main' into codex/10715-lit-query-stable-function-options