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