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