(cherry picked from commit 0d47d283a611b10cb7a842712cb01fa0c043bdc4) Co-authored-by: Akira Ajisaka <aajisaka@apache.org>