Patches applied as 84442d04235a615984667363c0f9b6b91d1ed0bf and
following.
Thanks.