fix: eicd to edm4eic in few remaining cases

Merged Wouter Deconinck requested to merge eicd-to-edm4eic into master

Merge request reports