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