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