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