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