AUTO-679 using embed_id as necessary