Merge branch 'hayahide2'

master1