Kuraoka bugcheck #86

Merged k-fujii merged 2 commits into nitta-lab-2021:master from nitta-lab-2021:kuraoka_bugcheck on 22 May 2021