c076645e18
This closes #864 Signed-off-by: Akira Ajisaka <aajisaka@apache.org> (cherry picked from commit d23e8e9232f030fcdeff91b9e8a625516244dc72)