checkpoint: into main from release/2.6.1 @ 0638d55 (#20688)

Source hash: 0638d55
Remaining commits: 5

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> **Low Risk**
> The provided diff contains no code changes, so functional risk is
minimal aside from potential merge/branch management issues.
> 
> **Overview**
> This PR appears to be a **checkpoint/merge sync** from `release/2.6.1`
into `main`, but the provided `full_diff` shows **no actual file
changes** (empty diff).
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
0c7af2c. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->

Author: cmmarslender