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