Patches applied as 6b8009510691b901ea292a89512c9f950f1509bd and
following.
Thanks.