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