Merge remote-tracking branch 'origin/main' into codex/revive-version-rating-reset