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