Patches pushed as 6e0c4a28b983916e2d5a19466fe085ce8127adf6 and
following.
Thanks.