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