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