Patches applied as bc6d1b4a417f87cd52a53dd22dd0ff18afc5a9b5 and
following.
Thanks.