Merge makoto_inoue's report to hiki