Patches applied as 4c1a7678b2d0ef801ae1ac03af449db3ab9fe9bc and
following.
Thanks.