Merge branch 'kaoriya'