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