Yichii #13

Merged r-shimozono merged 2 commits into nitta-lab-2025:master from nitta-lab-2025:yichii on 28 Nov