Thank you for the patch.

It looks reasonable for me, one missing part is to add commit annotation about changes in inputs and native inputs.

Thanks,

Oleg