Patches pushed as d6e2b467b88d0f663a941b796b2933ed009fca3f and
following.
Thanks.