Patches applied as 9aa00715d2cdb91c2ab86ef5d68646fecf7fe04e and
following.
Thanks.