Hi Masahiko,
> I've attached the updated patch. Please review it.
Looks good. I confirmed the v3 test changes fail on `master` and passwith the v3 code changes.
Best regards,Sergei