Edf contrib

Some contributions from EDF's CCN HPC
lines longer than 120 characters should be broken up