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