Fix/4.0.x/soc 3742

Backport from SOC-3619 fix.