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