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