Merge branch 'WIM' into master

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