Replace ECA thing with shim code

Merge request reports

Loading