Signed-off-by: Duo Zhang <zhangduo@apache.org> (cherry picked from commit d9713bf62147fcdd6f0b09df3ff48171ef1878d5)