Signed-off-by: Wellington Chevreuil <wchevreuil@apache.com> (cherry picked from commit 7f7a293cb5ce861f7a0275fda684e340545d3a86)