1a2aba85d8
This closes #1089 Signed-off-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit ee87e9a42e4ff1f27a6f1e5b7c7de97f8989d9b2)