Hi Guix,

I rebased these patches on master.

Thanks!

John