Merge remote-tracking branch 'origin/master' into v9.0

Change-Id: Ibc3a349d74ffaa74d7952274a7981352af054752
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>