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