Patches applied as cd9b667ba04a2acb24c5fdbe9b533d879288382d and
following.
Thanks.