Master branch synchronization from preprod

Guillaume Baulieurequested to merge
preprod into master

Correction of the build scripts

Merge request reports