Merge branch 'hotfix/soc_net_tasks_bug_fix'
fix
Merge branch 'hotfix/soc_net_tasks_bug_fix_2' into develop