Merge remote-tracking branch 'origin/main' into codex/pr738-corrected-local