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