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