Merge pull request #1280 from musashino205/adblk-upd-ja