Signed-off-by: Zheng Wang <wangzheng@apache.org> (cherry picked from commit 7d70141b90d188d69e259ad5de435dad4eed5bf8)