AUTO-679 using embed_id as necessary
Merge pull request #202 from GrabNetworks/dev-jd

AUTO-679 using embed_id as necessary