Network control updates
merge with dev-branch
merge with dev-branch