Patches pushed as 8c440538d5b109dbb0b4ee93919b7bf904757586 and
following.
Thanks.