fix/4.0.x/SOC-3642