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