Network controll update
Given name updates
Resolving merge conflict
merge with dev-branch