Patches applied as 7f4c9fe5304a4608d47e7526cd886be329d2381e and
following.
Thanks.