fix
Merge branch 'hotfix/soc_checks_fix'