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