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