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