Fixed Tomari-mura handling
auto-merge staging into master