fix: imported fixes 04-04-26

Merged
DI
5mo ago
+1080-164

Backport of #40405