Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit a2edae37ac)
a2edae37ac