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