v3007.8
Port fix for #68297 to 3007.x
Merge branch '3006.x' into merge/3006.x/3007.x-25-09-16
Merge branch '3006.x' into merge/3007.x/3006.x/2025-07-04
Fix scenarios merge wart
Fix tests and pre-commit
Fix broken backport 64229 form master to 3006.x
Pyupgrade and drop six
Merge forward 3006.x into 3007.x