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