Patches pushed as 59a7e5bb7eb6c6513befee0ff4f00424ba42f2a6 and
following.
Thanks.