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