Merge branch 'master' into v7.0

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