Added missing indexes for remote eid's
Merge branch 'master' into develop