Patches pushed as c000352c27f511dfb5569bef09f9b774d6100117 and
following.
Thanks.