Merge pull request #895 from musashino205/qos-upd-ja