chore: Resolve merge conflicts for 2026.07.2 (#2244)

This resolves merge conflicts in #2243 in preparation for release 2026.07.2. The merge conflicts arose from our use of a `release/2026.07.1` branch for release 2026.07.1.

Author: divbzero