Merge main into wm/patches (upstream sync + conflict resolution), ubol release 2026.222.1657 #21

Automated Upstream Integration Request

• Source branch: main
• Target branch: wm/patches

Current Workflow State

• main was synced from upstream/main.
• New upstream commits are ready to be integrated into wm/patches.

Goal

Merge main into wm/patches to bring upstream changes into our patched branch.

Required Work

1. Merge main into wm/patches.
2. Resolve any merge conflicts.
3. Ensure the branch is in a releasable state after conflict resolution.

Please assign this task to Copilot for conflict-resolution and integration support.