(cherry picked from commit 242604786b6b38916aa8548361fde01d9eb4f58c)
Signed-off-by: imjoey <majunjie@apache.org>