Merge branch 'master' into v5.0

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