Patches pushed as 68608dd412c49a3372567b2d43633d9c7161ecbb and
following.
Thanks.