Reviewed-by: Akira Ajisaka <aajisaka@apache.org> Reviewed-by: Hui Fei <ferhui@apache.org> (cherry picked from commit 66dda86fecee966c7b0625b19f700a43db9787a3)