[bot] Merge 25.7 to 25.11 (Conflicts)#1235

Merged

github-actions[bot] merged 2 commits intorelease25.11-SNAPSHOTfrom

25.11_fb_bot_merge_25.7

Dec 15, 2025

Commits on Dec 11, 2025

Suppress Rhino complaint for now (#1233)
labkey-adam
authored

Commits on Dec 15, 2025

Merge 25.7 to 25.11
cnathe
committed