Patches pushed as 990da1af79afa4c33385508f32f79878a4a67966 and
following.
Thanks.