Merge branch 'net-dev'. See body of commit for details.