Merge pull request #1271 from musashino205/nbm-upd-ja