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