Merge branch 'hayashi' into messages-ja