Fix/4.0.x/soc 3698