Hi Alex,

attached are two patches split and revised as requested.

Regards,
Mingye