Fix/4.0.4/soc 3841