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

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