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