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