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