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