Close #4820 Co-authored-by: Duo Zhang <zhangduo@apache.org> Signed-off-by: Duo Zhang <zhangduo@apache.org> (cherry picked from commit 382681e2d6b6c417145022d7df81390bf42f2773)