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