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