[WIP] Fix code based on review comment

[Copilot]

• Inspect PR review comment r3326903871 and identify the exact required change
• Discover existing lint/test commands for this repository
• Run existing lint/tests before code changes to capture baseline
• Apply only the requested catalog update tied to the single review comment
• Add/adjust minimal test coverage only if existing infrastructure supports it
• Run targeted validation after the change
• Run parallel validation (Code Review + CodeQL) and address any valid findings

[cookeac]

Will do the batch instead.