Fix/4.0.5/soc 3973