for merge
Merge branch 'hashi_asus'