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