Reviewed-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit 53249a40dbe7b4dae7da0a42d35c4601b043ebbe)