More inclusive about.
Minor networking improvements.
Merge branch 'develop' into poc-6+