Modifications from Master to 3.8 version : Part 2

Version to validate (specific terms, ...).
Compiles correctly.
Some pictures must be changed to fit the English version