[WIP] Merge main and fix merge conflicts from PR #7570

[Copilot]

Cloud agent has begun work on checkout branch from... and will update this pull request as work progresses.

Original prompt

checkout branch from PR #7570, merge main and fix merge conflicts.

Then address all open review comments. Perform extensive code review of the hcanges in the branch and fix any problem you find (do this 3 times).

Ensure the repo builds without diagnostics (no warning or error when calling build.cmd)

Once you are done with all of that commit and push changes

The user has attached the following file paths as relevant context:

• .github\copilot-instructions.md

Created from VS Code.