Patches pushed with a few fixes as
df484455f4a6e2a349705a188b356afefd78bcd5 and following.
Thanks.