Signed-off-by: Guanghao Zhang <zghao@apache.org> (cherry picked from commit 5c6ff7dc47b5340ff02e0dec144424ab91407e07)