Patches applied as 91cb1bb5829d6191288bd45331ce59630e35d346 and
following with a few minor modifications.
Thanks.