Merge branch 'kariya-mitsuru-use-sh'