Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org> Signed-off-by: Duo Zhang <zhangduo@apache.org> (cherry picked from commit 555f8b461ff432c1ad2bc79bffc9b3b49833b1f8)