Patches applied as 4b070c750fe728a34108235ee56e81088205a5ec and
following.
Thanks.