Merge branch 'feature7106'

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