Edf contrib

Some contributions from EDF's CCN HPC
please fix