Merge branch 'v2.0'

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