Merge branch 'v2.0' tag 'v2.0.2'

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