Fix/4.0.x/soc 3633

Backport from SOC-3629 on PLF 4.1.x