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