Nagae #249

Merged g-akagi merged 2 commits into nitta-lab-2021:master from nitta-lab-2021:nagae on 29 Oct 2021