More networking fixes.
Merge branch 'develop' into poc-6+