Patches applied as 828b08d58526cf242e121da3f0e3a3524aa507c8 and
following.
Thanks.