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