Merge pull request #904 from musashino205/firewall-upd-ja