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