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