Patches pushed as 170a3962404a9c0499c065d1c3fd9532f56e17b8 and
following.
Thanks.