Patches pushed as ea9b1e3bab1eef6e2a5d6728df816e918c6ea201 and
following.
Thanks.