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