Patches pushed as 60528f9ba729f7a22180d3a93d18bbdb3cfb2783 and
following.
Thanks.