This fixes #8031.  The buttons are in place, as well as a way to easily tell them apart.
Merge branch 'master' of github.com:hugllc/HUGnetLib