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