Success!!
We have now finally also passed the ESD tests. We had an issue that the unit would reset during contact discharge to the back ALU-plate.
Turns out that we need to have a rugged washer to penetrate the black anodizing so that the screws mounting the PCB to the plate will connect properly.
So thumbs up, we have a pass on all EMC tests now.
/PA