This fixes #7713 and fixes #7714.
Merge branch 'master' of github.com:hugllc/HUGnetLib