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