Hi Nicolas,

Here is another patch series with the requested changes.

Thanks,
Adam