Patches pushed as 333e1b3ce670d257c5aee4ed2b9303992aeeaa69 and
following.
Thanks.