MichishitaEdit #147

Merged k-fujii merged 13 commits into nitta-lab-2021:master from nitta-lab-2021:michishitaEdit on 21 Jul 2021