Merge branch 'master' into v7.0

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