Merge branch 'hotfix/soc_shelude_for_test'
fix
Merge branch 'hotfix/fix_soc_sharing' into develop