Patches applied as 372ffc07bcd84803942b38b2beb7e0660faff84e and
following.
Thanks.