Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org> (cherry picked from commit d60ce17c1765a445e944738f49953579bdf0bba6)