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