Skipped over unique names if IDs are equal
Merge branch 'dev-set3-iteration3' of github.com:333fred/wpi-suite-tng into dev-set3-iteration3