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