merge v1.0.2 -commit b1c42b6- into master

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