Merge branch 'master' into generic

Change-Id: I388e9d4edc0551e37f90650d32ee95c5263c065b
Signed-off-by: Philippe DUL <philippe.dul@thalesgroup.com>