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