Merge branch 'feature628'

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