ICSHWI-6183: e3 wrapper fixes after an internal round of review;
e3 wrapper fixes after an internal round of review; but, it is not used by NSS instruments (Conda package instead);
As proposed in ICSHWI-6183;
Please @tomaszbrys, @nicklasholmberg2, at least one of you to analyse this MR, please!