Fix/4.0.x/soc 4275