Idea for network execution delay fix
Merge branch 'modules_M' into issues_M
Merge branch 'master' into issues_M
Fixes #734
merging master