Norihiro Tanaka wrote:
> I rebased this patch because of confliction.

I fixed the degration in rebase.