fix: imported fixes 08-18-2026

Merged
DI
3mo ago
+127-36

Backport of #41814