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