Hi Jakub,
I have updated this patch and rebased with current trunk. The issues you identified
in the last review should all be resolved. Is this now okay for trunk?

Thanks, and Happy New Year~
Chung-Lin