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