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