Patches pushed as e22a711c97e0501b398467733164da4ee140036e and
following.
Thanks.