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