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