Resolve "Implement EID and NIMLOC"

Merged Mark Andrews requested to merge 626-implement-eid-and-nimloc into master

Closes #626 (closed)

Edited by Evan Hunt

Merge request reports