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