Feature/soc 3430