fix: imported fixes 06-11-26

Merged
DI
4mo ago
+883-87

Backport of #40889