Additional network niceness.
Merge branch 'develop' into poc-6+