fix: imported fixes 04-04-26

Merged
DI
6mo ago
+1076-159

Backport of #40405