Patches pushed as 1a8a78a0c4f2bad3f33ec692464ef0b64b3af103 and
following.
Thanks.