Merge branch 'master' into v7.0

Change-Id: Ib897981a21e8cf5c5a5b814334520d3b0dc80693
Signed-off-by: lombardofr <lombardo@everyup.it>