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