Signed-off-by: Liangjun He <heliangjun@apache.org> (cherry picked from commit 18ae733b15ae2bc316f41af1a46e5619d2b35fe2)