Merge feature7106

Change-Id: I2c20e43ec17701cb0a3f2f77e785f97bc3fc030c
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>