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