Signed-off-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit 61df174e8b3d582183306cabfa2347c8b96322ff)