6690955358
This closes #821 Signed-off-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit 67f9a7b165edecbec7c8063758202be4d8cff0f5)