Patches applied as dcc278885c9d04809008e3053c4ca40760033f55 and
following.
Thanks.