Merge tag '1.0.6' into develop

1.0.6
1.0.7

Signed-off-by: Graziano Vincini <graziano.vincini@caffeinalab.com>
Merge branch 'release/1.0.7'