Patches pushed as 3eeb67c5d9594b3e2ff41ab95183d3ca51a0d893 and
following.
Thanks.